From 5b5cf89a633db1cd80683712bf27cc7ee5ca3581 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 9 Jun 2014 21:09:40 -0400 Subject: [PATCH] Add GtkActionBar and GtkSearchBar to visual index These were missing. --- docs/reference/gtk/Makefile.am | 2 + docs/reference/gtk/images/action-bar.png | Bin 0 -> 1905 bytes docs/reference/gtk/images/search-bar.png | Bin 0 -> 3699 bytes docs/reference/gtk/visual_index.xml | 6 ++ docs/tools/widgets.c | 70 +++++++++++++++++++++++ 5 files changed, 78 insertions(+) create mode 100644 docs/reference/gtk/images/action-bar.png create mode 100644 docs/reference/gtk/images/search-bar.png diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index ee7e155710..988e5c5880 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -300,6 +300,7 @@ HTML_IMAGES = \ $(top_srcdir)/gtk/stock-icons/24/gtk-page-setup.png \ $(srcdir)/images/aboutdialog.png \ $(srcdir)/images/accel-label.png \ + $(srcdir)/images/action-bar.png \ $(srcdir)/images/appchooserbutton.png \ $(srcdir)/images/appchooserdialog.png \ $(srcdir)/images/assistant.png \ @@ -348,6 +349,7 @@ HTML_IMAGES = \ $(srcdir)/images/scales.png \ $(srcdir)/images/scrollbar.png \ $(srcdir)/images/scrolledwindow.png \ + $(srcdir)/images/search-bar.png \ $(srcdir)/images/search-entry.png \ $(srcdir)/images/separator.png \ $(srcdir)/images/spinbutton.png \ diff --git a/docs/reference/gtk/images/action-bar.png b/docs/reference/gtk/images/action-bar.png new file mode 100644 index 0000000000000000000000000000000000000000..d7b36eae7e4af0a1094e6f77b27820b4fabce9dd GIT binary patch literal 1905 zcmcIl`8V5%7XKzfltx6gh_zwJptdS0v9(b=MMjMvw!u(UV{eHq(@y)OMNV{3wNCYE zseKC`!mB+cY?_vWdHzx zxj5rI0RSXU0iv{&*q2--u80F9;gXA&wAj+5!?FMXigv*{cqNx?EwEzLBGiZfEUnR1=kI$P6D{F+an6*X-UbyJkjJ`kdUA2 zX@G_Q#N3u5fI4#x$nv=g z(h4z^Bxeo&-+-v24;A#E7Un0daAD9^VbbE%bB`E;I!b{?p-|4*dAkCLhu;D?!zw_& z=`q-TAVfwCv>rDiQtKCT-td61ZD_%v;@sTI& zd6S|e4|ebk5|SLm*fFxp*z?p$qUg-!2Ao(E*b*9Yc8YJa-&ZT#sHzeXqcX@;yW_$F ziI98hzTksi)s;I^sN+)!4Mjk+b*&}RX1+A0-+}@ z*`L3!I|Mx#L~-IfD}lAJ6TG_T?xyK{qemj4GC9Zz4?XT$$^2>AHxP5a{RbHhg3Ux4X;m(>=)eFN&dn%_u}jjAE050_INJ`G z3@xtgv~5us>0WeECoLj{<77;O+fM+g7F@~MQqZLur zPCBp1Gw#-I3YHbh?oBUIP0w(h&`h$K2;A8S66hBOrRM0hq}SHg;sOhu^BmhD z*Da1MhInglw0lK8N+v^%t*x#9pbD%4z_kq#!c{`b_A$J}<|3t-wUZy}bjTf%e%^Zs z^Ph=6oMgM(pd#fzDpdG}dZ}i%3}3J^sv*fpQVTO;e-(s zQN1UZ1-7!XvWA9+H?KLOMwOTf71Lg6Ego`Ddc5bqFnP8Bs4I|)GsnOE%IgX|`t|hm z=^xLzaduLg=Wf>g1%rdHU(f37yeOw>>n|AcuWVUf+7?*O&#ZOq@tGX6goFe&t3>n# zu{s^a>cnElcX!SCmzCZPM2h=P>A9Qt+{8qFtuA&My?XVk1e;>EPC|adHgJ^ge^HTN zYr0%t(gN;+!1Iv(J0ArU?sLDV*_7euL68M2u}CBZ}SesQL8qYb;~H0{=D-{L{S-HJXx zz}yCkug6x*3-2E#fCJC~F0Wn@IX%>nTLqF21bfk6PO#lxAE+cEXwGl*XL4e-eg!e! zBmr^`351weuyS9z2QIIgv_#cJa+2P|j3IX_`d?N~w`b{GI~Zf^5y0=-Mewd7-;2`J SH)q8^6mW5L$JJj7zVlx=oNy%o literal 0 HcmV?d00001 diff --git a/docs/reference/gtk/images/search-bar.png b/docs/reference/gtk/images/search-bar.png new file mode 100644 index 0000000000000000000000000000000000000000..084ba89225b53b89a0cba2ab4df6845902c48c79 GIT binary patch literal 3699 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 NsVJ%`l*pO*{tqQ~02BZK literal 0 HcmV?d00001 diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml index 1df14dda56..5806d395d0 100644 --- a/docs/reference/gtk/visual_index.xml +++ b/docs/reference/gtk/visual_index.xml @@ -123,6 +123,12 @@ + + + + + + diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index f48af364fd..cd16d8064b 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -395,6 +395,74 @@ create_info_bar (void) return info; } + +static WidgetInfo * +create_search_bar (void) +{ + GtkWidget *widget; + GtkWidget *entry; + GtkWidget *align; + WidgetInfo *info; + GtkWidget *view; + GtkWidget *box; + + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + widget = gtk_search_bar_new (); + + entry = gtk_search_entry_new (); + gtk_entry_set_text (GTK_ENTRY (entry), "Search Bar"); + gtk_container_add (GTK_CONTAINER (widget), entry); + gtk_widget_show (entry); + + gtk_search_bar_set_show_close_button (GTK_SEARCH_BAR (widget), TRUE); + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (widget), TRUE); + + gtk_container_add (GTK_CONTAINER (box), widget); + + view = gtk_text_view_new (); + gtk_widget_show (view); + gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE, 0); + + info = new_widget_info ("search-bar", box, SMALL); + gtk_container_set_border_width (GTK_CONTAINER (info->window), 0); + + return info; +} + +static WidgetInfo * +create_action_bar (void) +{ + GtkWidget *widget; + GtkWidget *button; + WidgetInfo *info; + GtkWidget *view; + GtkWidget *box; + + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + view = gtk_text_view_new (); + gtk_widget_show (view); + gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE, 0); + + widget = gtk_action_bar_new (); + + button = gtk_button_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_MENU); + gtk_widget_show (button); + gtk_container_add (GTK_CONTAINER (widget), button); + button = gtk_button_new_from_icon_name ("call-start-symbolic", GTK_ICON_SIZE_MENU); + gtk_widget_show (button); + gtk_container_add (GTK_CONTAINER (widget), button); + g_object_set (gtk_widget_get_parent (button), "margin", 6, "spacing", 6, NULL); + + gtk_widget_show (widget); + + gtk_container_add (GTK_CONTAINER (box), widget); + + info = new_widget_info ("action-bar", box, SMALL); + gtk_container_set_border_width (GTK_CONTAINER (info->window), 0); + + return info; +} + static WidgetInfo * create_recent_chooser_dialog (void) { @@ -1409,6 +1477,8 @@ get_all_widgets (void) { GList *retval = NULL; + retval = g_list_prepend (retval, create_search_bar ()); + retval = g_list_prepend (retval, create_action_bar ()); retval = g_list_prepend (retval, create_list_box()); retval = g_list_prepend (retval, create_flow_box()); retval = g_list_prepend (retval, create_headerbar ()); -- 2.30.2